From 95ab2a72b4ba0a84b9c430d941f778367e02584b Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 30 Jan 2002 21:00:49 +0000 Subject: [PATCH] Allow a -1 icon size. 2002-01-30 Anders Carlsson * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkstyle.c | 2 +- 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 246a36c0cb..2f65e52d83 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2002-01-30 Anders Carlsson + + * gtk/gtkstyle.c (gtk_default_render_icon): Allow a -1 icon size. + Wed Jan 30 20:29:01 2002 Tim Janik * gtk/gtkscale.c (gtk_scale_set_digits): fix revrted bug fix. diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index b430730171..a88765196a 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -1900,7 +1900,7 @@ gtk_default_render_icon (GtkStyle *style, g_return_val_if_fail (base_pixbuf != NULL, NULL); - if (!gtk_icon_size_lookup (size, &width, &height)) + if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup (size, &width, &height)) { g_warning (G_STRLOC ": invalid icon size `%d'", size); return NULL; -- 2.30.2